Removes some not necessary stuff and relocates missplaced tests