Removed ifdef from test files, since we have moved to a Makefile for our official build.