added a few more tests and fixed up candidate errors