latest tests cleaned up; worked on swiss