added tests. Temporaly commit 25.11.2013 03:30