Decomposes the test_observatory test into multiple sets of assertions

This is a work in progress...