tests left behind from older laptop
merged older changes