Updated to use test stubs
0.5.1