Even more unitt test cleanup
Even more unitt test cleanup
Suggested platforms functionality