Initial commit to get tests working on sqwci