Added new files for unit testing and modified some