Refactor to make clearer
Refactor testing - different data structure and add message