more testing
fixed test merge conflict