Changed tests and prepare to add new features