Improve tests for base player