tests, constructor fixes