Updated to use test stubs
0.8.1