Some fixes here and there, add user test cases