moved tests into the package
added more coverage