tests moved to correct location