add old tests and copy over the evaluate function; TESTS FAIL