moved all tests to test.c, added eval of +