Add more samples, fix test, add raw output for Properties