Added dummy player testing
Refactoring & fixes