combined 2 tests into one, addressed some formatting