Initial drop-in support and fixed existing tests