Updated test-code to be simpler