Speed up tests. #15