Added miscellaneous edge case tests. Got rid of some unused code.