getting ready for tests, stripping out db dependancy