Updated to use test stubs
0.4.1