improve test readability
completed some pending tests