added initial implementation
fixed standard test