Added new test stuff