refactoring speaker model and adding integration test