Removed unnecessary dependancies
Added test directories to commit

Eclipse will not compile correctly of test directories are missing.