Fixed some non-functional set code & updated tests: Fixes #78.