And even more tests.
Started styling and cleaning up tests.