Added a heap more tests