Added tests and test adapter