Updates to tests. Making the implementation of performing actions cleaner.