Moved some tests from plugin