Increasing the timeout to avoid conflicts
Adding some Junits for the Main Service Class