fixed dependancies and unit tests