refactoring slick test, to include additional features