Commited w/ test code in there...

Signed-off-by: Michael Welter <michael@cetoncorp.com>