Adding bigger test, other tweaks