Beef up tests and add nocommits