Clean up test. Ready for implementation. Closes #1.