Fixed make file to include both tests
fixing conflicts