npe fix
preparing
working on resolving
fix resolving type from stubbing