Remove unwanted files and add ciaran test file
Merge remote-tracking branch 'origin/master' into Ciaran