Start fixing tests to support reuirejs