Modified Unit tests and top level library file for modularization