updated handler tests