Removed tests and put in a real question class