Added more test stuff