updated tests for new functionality, revamped test cases for better end case testing
resolved merge conflict with a single line of comment having been removed between versions