Started adding in tests
Did some more work