Removed extra self. Also added more testing.