Move controlle specs to expect syntax