Remove {unser} and add tests