Renamed test packages to follow naming convention