Various changes readying for testing framework