second commit - fixed tests