Big refactor - improving the test structure and layout also exteding the call coverage