Test work & changes to check failed tests