Added Sorting, added Kalk.Test