Refactor some tests
Add binstubs
Flickr handle: @m_janko => @jankomarohnic