Fix reporting. More tests