Fix master unit tests