moved some stuff and more tests