Remove old redundant test + add setUp to new test