replaced redundant code in notec
increase test coverage