Started adding capture validation to the tests
Improved tests
Bump version to 0.2.1