Compilation fix and small extension to test