Merging in Issue 16 for Writing Test app