Added autotest/rspec support