Troubleshooting test problems with Joshus. Tried to add Mason's changes by hand, but missed something.
First test passing.