changed fish to bird
cleaned up tests