Fixing instance variable definitions
Adding tests