Fix unit tests
Add unit tests moved from standards