Progress on tests/ based rspec system but not yet done