Added tests (minus bug conflict)