Improve tests

Switch from ok() to equal() to allow for better testing.