modify tests, added coverage