Added computed questions and test