updated tests based on @derdon comments