Created first test suite, fixed bugs on extraction (corner cases)