Added slightly dynamic tests