fixed some tests
fixed unexpected return type
added TODO