just fixed some Rake and test...WIP
fixing tests, some code cleanup