Fix tests

fix rake spec and rake spec:system tests