Taken out idiotic dependencies from main test file