added and refactored more tests