Implemented a method to build the source string
Removed outdated tests