Added samples + fixed tests