Updated to use test stubs
0.2.1