Make new tests more thorough