clean-ups, thanks hlint
make tests work