Tests merged into master