Last few tests

Added the last couple of automated tests