Final, not static
add new tests