Updated tests to use test-data.yml
References for testing
Fixed comments
Deleted unecessary files