organizing tests to multiple files + new simple tests