Cleaned up tests to reflect recent changes