Merging changes in test to here

Trying to integrate this branch with the changes made in test