Added more basic test functionality