Added Tests scaffolding