unit test and # removed