Added groovy test's support