Actually be a default, fix unit tests