Final changes and Test