Readded tests
Integration in progress
Work in progress