Finish RSpec Tests and Test Env Tuning