US1

Removed unit tests