Removed acceptance creator and included some unit tests