re-adding tests