Working on adding test support