fixes && new tests
clean