Added tests, maps predictions well it seems, will write that tomorrow