removed dead tests
added stubbing tests