slightly more calisthenic test adn dockblock fix