Fixed Listener + misc cleanup

Removed ChestTest - no need for it