Test driving - Closes #13 and #14