Improved comment & api tests