improve tests
split various checks and outputs into own methods