started writing tests
merge