Fixed tests and sample project.