Front End Testing and small changes