Srdjan's test commit