merge with tests