Merged tests_relational.cpp with test.cpp, updated makefile