moved tests to same package as CUT