More tests

Signed-off-by: Ryan Benoit <rdbenoit@me.com>