Spec Update

Noticed the specs were a little out of sync with the other modules in their layout and variable use so I have updated to match and fixed a few bugs/omissions with the specs also.