merged changes from branch
fixed test as per branch additions