Removed solution reader interface for now since it is not needed. Minor refactoring of tests.