Functional tests fixed (Done: 53, Failed: 2)