Added non-rand tests