Implemented pending tests