looking much better
new tests