More test code added