Add more code for testing