Merge Tomas test suite, some initial structure

First initial structure, would need some more polish later, but I would say a good start.