updating test, merge is still broken