start adding tests
merge