Renamed test package, added tests