Fix for issue #67 - Allow Expected Result on simple tests

Most of this is tests and some refactoring.