Merge "Adding more Junits to misc env"