Tests and improvements for 1st milestone #35