Continuing debugging of custom token
Repaired broken test
Removed dev fail