Fixed drawing coordinates and added test class.