Test refactor and upgrade to grooscript 0.3.4