Should be seprated into 2 tests