WIP: got tests working, but gotta clean up

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant