Added some tests, but unable to run them yet because Xcode refuses to run them.