Updated tests to account for recent refactoring