* Fix compute methods dependencies and small optimizations * Rename demo file to test and move it into the right folder