Now with some additional tests

Signed-off-by: Richard Minerich <richard.minerich@gmail.com>