SLICE-42 Fixed bug when mapping bound classes, added test case, cleaned up tests