Better test coverage, fixed issues with capybara
Added configuarble loading of capture types
Better test coverage, fixed issues with capybara