moved some dependencies from test to compile
minor changes