Edited some tests