Merge tests into alpha