Features/54 faster test cases