Re-added unit tests and fixed them to meet the requirements of the current code.
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013