fix plugin order, add even more tests