added a couple more test cases
removed functions that have become redundant due to refactoring in previous commits