Fix some problems for rspec tests
comment system finished