Resolved Warnings, set up unit tests