Finished Logic Tests
Merge tests