Adds a test, shifts things around to keep it easy to use.