refactored some test code and added more test points