Clean up old tests
Improve RSpec exception handling and fix optarg
Remove recursion bugs and clean up