Adapted the rest of the old tests and fixed corresponding behaviour
Version 0.1.1