Resolved test pass issues