Add more tests, minor modifications to domain