More tests and hiding the drawer sooner