Cleaded up test/