fixed tests and squashed commits