Simple tests working now