Consolidating test into a single test file. Removed js tests.
Consolidating test into a single test file. Removed js tests.
Consolidating test into a single test file. Removed js tests.