Fix tests

And simplify with some shinies