Finished, removed some test cases that conflicted with features of the application