fix two tests and make another more clear