More tests passing but still issues