test updates
merging
revised tests