Update sami config
Update and debug classes
Update unit tests