Added scaffolding for Tests and Bugs