US617 - Implemented pending tests
US617 - Improve testing