expanded tests and trimmed dependencies