Add more testing