additional tests
minor unittest changes