remove test, will rewrite later
move dependencies to sublevel