all test in spock
assertions, builders moved to groovy
Merge branch 'master' into spock_test
revert spring test
Merge pull request #4 from javers/spock_test

tests -> spock