Moved test package into main package and more tests to increase coverage