Adding tests and compile versions