Compete refactor of initial test class.  More test cases added.