Test suite made more generic. Still error in test