Implemented all remaining specs