Several changes, self testing