better tests + integration with rake