Fixing some incorrect method calls. Tests now pass