added/fixed tests