WIP removed unit tests - need to run with be + rake