added some info to readme file
added code for creating tests
resolved merge conflicts