Added Experience test suite
Small fixes in code while waiting for refactoring