Try to get existing tests working