Add more tests. Refs #125