fixes rake file issue
fixed test issues