Changed trigger names for consistancy and added docstrings to tests cases.