Created tests, fixed a minor issue.