Handle reference property
Make setup behave properly when imported
Reorganize tests