Fix system spec and tests

The following commits fix `bundle exec rske spec_system` and `bundle exec rake test`