adds some tests
merging tests to master