Update unit tests. Refine AWS instructions