Proper packaging and more services

It seems we came with a nice format for these tests. :)