address PR issues
* this instead of @
* renamed and reorganized some specs