UnitTests
Added peak support