OSCAR-0

Updated unit tests.