Minor mods, moved some tests