First two tests now passing

Signed-off-by: james.murphy <jamurphy84@hotmail.com>