Test fixes and merges