More tests.
Fixed the error output.
More testing.