added to test library. Renamed namespace
Added heap