Working. Cleaned up language in tests, should be easier to read now.