Unit test cleanup

cleaned up code  comments and loaded dependencies.
this should make it a bit more clearer what's needed where.