Updated skeleton with tests that need implementing (issue #6)