actually workign tests etc.
Merge branch 'working-stuff'

* working-stuff:
  actually workign tests etc.