Modified status.rb and status_test.rb