Updated some tests to pass; had to remove their constants, which were being initialized in another spec file.