0.0.4 - cleaning up useless ivars, fixing tests