Fixed some errors in drawing and added test files