added and fixed tests
?