Removed unused bounds in draw_* functions
Fixed the tests to work with the refactored code