Pskel cleanup
First test using mock!