Fixed tests. Version 0.0003