Fixed a few invalid tests and added the OPTIONS test.