Updated to use test stubs
0.7.1