Add more start and end tests