Updates due to first tests