Testing for MarkAsDone and Edit together with some fixes for some minor bugs