Form package test cleanup