Refactored tests due changed stuff.