Update all to new Code Convention, Update tests