Beter separation of tests and close call test