Test coverage

Our intention to make the sourcecode more modularity