Fixed unit test functions to work with new class edits - bad!