Updated Tests
Major changes to patch bugs