Cleanup unused import, add comment rename a test assert