Fix code review comments
Added a todo
Fix tests and few style checks
Fix PL's test and build files