Added navigation, some tests