applied hlint suggestions
widened dependencies for test suite
split test module in two separate modules