added andrew's tests to test