Put primary unit-tests back in.