Adding scaffold and tests that run