finished super calc with tests