merged tests from myke