Merged master tests