some pretty unittests
resolve conflict