Remove spec & file for autoseting instance variables; rename test file