Adding better unit testing
Fixing merge issues