Added #218 tests