TEST: modified tests to make them pass.  should be good