begin writing more tests
fix merge conflicts