Fixed and partially finalised Unit Tests