Fixing broken tests and updating all tests to (attempt) to use describe/context blocks for readability