added should stubs
added todo
added tests