new tests. cleaned em up a bit

Signed-off-by: Daniel Fagnan <dnfagnan@gmail.com>