refactored test package name and fixed some errors that arised in test cases from that