Added tests in a82b81a