Additional comments/documentation & calculator tests