Added "Demo Runner"
Fixed some tests