Cleanup; more tests; inverse args