Move Callbacks spec to correct folder
Code cleanup in ValidationChain
Code cleanup in Keys module