Adjusted bugs + Added Test (needs Double Buffer)