tests updates
new tests, new directory tree