Upgraded to slick, cleaned up imports, added tests, minor fixes.