Fixed spec failure and clean up