Small updates to sizes, fix a bug in mouse test