More test crud + fixes