changed the tests to use eql, reorganized