Rewrote test suite and removed class requirement.