Version 2.0

Better code and test added, remove index test is remaining