Small cleanup, test improvements