Applied changes + more tests