Add some noop tests and some cleanup