Cleaned up callbacks spec
Merge pull request #1415 from thejameskyle/cleanup-callbacks

Cleaned up callbacks spec