tighten code syntax in tests, still need to fix them tho