tests passing now and deleted some specs