fixed some fectoring issues, removed cache id
minor fix from refactoring
updated tests, fixed various issues arising from refactoring
updated tests
added smaller test data and cached listener