Added forward() method and more tests