Add system tests
Clean up tests